Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Combined ulge file #820

Merged
merged 2 commits into from
Dec 18, 2024
Merged

Combined ulge file #820

merged 2 commits into from
Dec 18, 2024

Conversation

jnippula
Copy link

Combine encrypted log data and symmetric key into one single .ulge file.

@jnippula jnippula requested a review from jlaitine November 19, 2024 13:44
@jnippula
Copy link
Author

jnippula commented Nov 19, 2024

branch for upstream is pr-logger-combined-enc-file
Documentation for upstream updated in separate repo/branch: https://github.com/jnippula/PX4-user_guide/blob/pr-dev-log-combined-enc-file/en/dev_log/log_encryption.md

@jnippula
Copy link
Author

Upstream PR version still needs to be verified with HW (e.g. fmu-v5x) before creating the PR.

@jlaitine
Copy link

LGTM! I'd like see this offered upstream first though to avoid merge conflicts later...

@jnippula
Copy link
Author

jnippula commented Nov 25, 2024

LGTM! I'd like see this offered upstream first though to avoid merge conflicts later...

Yes, I created PR's for upstream already:
PX4#24024
PX4/PX4-user_guide#3468

@jnippula
Copy link
Author

jnippula commented Nov 25, 2024

Upstream PR version still needs to be verified with HW (e.g. fmu-v5x) before creating the PR.

Upstream patch verified with Pixhawk4 (fmu-v5)

@jnippula
Copy link
Author

Now commits are cherry-picked from upstream

Use one single .ulge file to store both wrapped symmetric key and
encrypted ulog data instead of creating separate .ulgk/ulgc files
@jnippula jnippula merged commit 512fb8e into main Dec 18, 2024
27 checks passed
@jnippula jnippula deleted the combined-ulge-file branch December 19, 2024 07:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants